registration: Use array_merge() rather than array plus when merging
authorRoan Kattouw <roan.kattouw@gmail.com>
Tue, 31 Mar 2015 00:39:36 +0000 (17:39 -0700)
committerLegoktm <legoktm.wikipedia@gmail.com>
Tue, 31 Mar 2015 00:45:10 +0000 (00:45 +0000)
commit36e205b1fc97808dffc06e4d0719747f2bc97fcf
treeb20ed25e24e8a92e953e357ce03fd3f289008f6b
parent7cf070f9cbb71b2bb3fcba5b7c632970ab6bf933
registration: Use array_merge() rather than array plus when merging

Because plus doesn't deal with numerical keys well. We do need old values
to win, because LocalSettings.php runs before extension.json files.

Change-Id: I56318fe586776940f7e28ca038dad49d24f24f2e
includes/registration/ExtensionRegistry.php